Cleaned up some unessesary module references.