Cleanup, removing unrequired code