Removed some lame code