Removing old code from current