Issue #182 Removed un-necessary codes