some cleanup, got rid of unneeded trampolines