Tidying up code

Some minor updates to code, removing forums.