Removed useless calculations left from vanilla code