Commented out unused method
Added missing forward declarations