Improved scoping to allow inheritance to work in future.
Deleted file that shouldn't have been included.