Moving Admirals up list

and removing unusued code