Removed non-essential stuff and general tidyup