Remove unnnecessary code