Removing un-necessary stuff