Cleanup stuff

ya, if you find a case I'll gladly add it back. Its just nice not to need to rebind.