making it a real bottle (doh) and cleaning up some obsolete code