Date fixes, unused methods removing and some refactoring