Removed some weird stuff for now