Remove inncesary code