cleanup, remove unecessary bits