Cleaned dead code from base