Removed redundant and problematic code for Hero unit