removing extraneous stuff so i can make everything fancy