Ajay/Melanie | #0000 | Clean-up | Removed unused methods