Removed test, cleaned parse