remove pre-engine code
get tests passing