Removed code that has never been used and simplified naming.