Cleaned up the rapid prototype code.