Removed unused settings

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Major re-factor

Signed-off-by: Elliot Condon <e@elliotcondon.com>
minor improvements

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Major refactor

Signed-off-by: Elliot Condon <e@elliotcondon.com>