Removed further unnecessary stuff