Removed some things that are not used