Removed old and unclean methods, new will come later