Cleaning up extraneous bits