Version 1.10.4

General tidy up and removal of non-essential functions