Removed custom modules from contrib branch