Remove broken startup. Add proper startup. Clean up parser.