Removed WndProc override and general code tidy

Removed WndProc as overriding form repaint now resolves the issue.
General code tidy up