Cleaned up old merged code