Removed commented crap that shouldnt have been committed