cleaning up, buttercup

removing unnecessary code