Cleaned up tasks to remove check-if-follows

Half done verification via DM
More updates
Merge branch 'cleanup'
Cleaned up table definitions
Added comment