Cleaning up last bits