Cleanup redunant code