Removed notes, moved some stuff