Cleanup code, remove unneeded calls