Removed all junk code