Removed some unnecessary stuff