Removed a bunch of uneeded code. Commented out the valid combo check for now