Cleaning up version 1