Cleaned unused code