Removed some waste stuff