Removing some unnecessary stuff