much cleaner solution
remove commented old code