Cleaned up unused/useless code