Cleaned up junk functions