Aliases removed from db and code