Removing useless(?) code