Cleaned up unnecessary code (moved to dev branch)