Remove un-necessary stuff