Removed methods that was never used and some other small changes