Code refactoring
GENERAL: Removed unused commented text waiting for documentation