Add profiling option
remove unused test
revert to dumb logging for now
Remove scheme checking overhead
PEP8: Newline at end of file