Cleaned up useless code