Cleanup

Removed notices for testing and rearranged some things.