Fixing previous commit, had thought I built / tested properly. Removing multiple declarations of some methods.