Fixed: Remove debugging messages & dead code