Removed pointless stuff