Merged changes

Removing enemy