Code cleanup for module

Code removed was in attempt to add a new feature, in development. Will further attempt later, for now, removing the use of the code to speed things up.