Removed some mess