SUPER CODE CLEANUP