Removed some not needed things