Removed redundant dependencies
Tweaked the table-initialization wait time.