Commented out a bunch of useless stuff for now