Cleaned up extra non-necessary code