removed redundant function and cleaned up code, fixed bug
removed redundant function and cleaned up code, fixed bug

dpshelio/sunpy,mjm159/sunpy,Alex-Ian-Hamilton/sunpy,Alex-Ian-Hamilton/sunpy,mjm159/sunpy,dpshelio/sunpy,Alex-Ian-Hamilton/sunpy,dpshelio/sunpy