Remove unnesessary code