Cleanup

Stripped down to bare functionality