DEV: Remove commented code