Removing unnecessary stuff