Removing massive load code