Cleanup - Unnecessary this removed